Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[F3D] Fix RDP world defaults #377

Merged
merged 10 commits into from
Aug 5, 2024

Conversation

Lilaa3
Copy link
Collaborator

@Lilaa3 Lilaa3 commented Jul 10, 2024

T̶h̶i̶s̶ ̶i̶s̶ ̶t̶h̶e̶ ̶u̶c̶o̶d̶e̶ ̶d̶e̶f̶a̶u̶l̶t̶,̶ ̶s̶o̶ ̶h̶a̶v̶i̶n̶g̶ ̶t̶h̶i̶s̶ ̶s̶e̶t̶ ̶t̶o̶ ̶N̶O̶I̶S̶E̶ ̶i̶s̶ ̶a̶ ̶w̶e̶i̶r̶d̶ ̶c̶h̶o̶i̶c̶e̶ ̶t̶h̶a̶t̶ ̶a̶l̶s̶o̶ ̶b̶r̶e̶a̶k̶s̶ ̶S̶M̶6̶4̶ ̶(̶p̶l̶e̶a̶s̶e̶ ̶c̶o̶n̶f̶i̶r̶m̶ ̶t̶h̶i̶s̶ ̶d̶o̶e̶s̶n̶´̶t̶ ̶a̶f̶f̶e̶c̶t̶ ̶O̶O̶T̶ ̶p̶l̶e̶a̶s̶e̶)̶
World defaults need to vary across game modes, this pr will try to focus on that from now

This is the ucode default, so having this set to NOISE is a weird choice that also breaks SM64 (please confirm this doesn´t affect OOT please)
@Lilaa3 Lilaa3 marked this pull request as draft July 10, 2024 16:25
@Lilaa3
Copy link
Collaborator Author

Lilaa3 commented Jul 10, 2024

Draft until a good solution for game mode world defaults is implemented aha

@Lilaa3 Lilaa3 changed the title [F3D] Default to G_AD_DISABLE over G_AD_NOISE [F3D] Fix RDP world defaults Jul 10, 2024
@Lilaa3 Lilaa3 marked this pull request as ready for review July 10, 2024 17:15
Lilaa3 added 3 commits July 11, 2024 17:04
assume every geo mode is off for oot

formatting and grammar fix

Make world defaults draw into one function, add better text and homebrew mode warning

two cycle in oot
Copy link
Contributor

@Yanis002 Yanis002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know much about this in general but here's a code review

__init__.py Outdated Show resolved Hide resolved
__init__.py Outdated Show resolved Hide resolved
fast64_internal/f3d/f3d_material.py Outdated Show resolved Hide resolved
fast64_internal/sm64/sm64_constants.py Show resolved Hide resolved
@Yanis002
Copy link
Contributor

Yanis002 commented Aug 2, 2024

where is world defined? from what I can tell it should be a blender prop since it's under bpy's Scene so it can't be None right? 🤔

@Lilaa3
Copy link
Collaborator Author

Lilaa3 commented Aug 2, 2024

where is world defined? from what I can tell it should be a blender prop since it's under bpy's Scene so it can't be None right? 🤔

it can in fact be none, see #330 and my fix #334

@Lilaa3
Copy link
Collaborator Author

Lilaa3 commented Aug 2, 2024

I should add that the scene world is picked in the world properties tab
image

Copy link
Contributor

@Yanis002 Yanis002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OoT seems to work properly

@Lilaa3 Lilaa3 added the f3d Has to do with the "f3d" code common to all games label Aug 2, 2024
@Lilaa3 Lilaa3 requested a review from Yanis002 August 3, 2024 09:57
@Lilaa3 Lilaa3 merged commit f4b39c3 into Fast-64:main Aug 5, 2024
1 check passed
@Lilaa3 Lilaa3 deleted the alpha-dither-default-to-disable branch August 24, 2024 11:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
f3d Has to do with the "f3d" code common to all games
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants